diff --git a/src/apps/stylededit/Constants.h b/src/apps/stylededit/Constants.h
index 46ffbcbcf8..c52f337bf2 100644
--- a/src/apps/stylededit/Constants.h
+++ b/src/apps/stylededit/Constants.h
@@ -10,7 +10,12 @@
 #include <SupportDefs.h>
 #endif
 
-#define APP_SIGNATURE  "application/x-vnd.obos-stylededit"
+//See if this takes care of some problems with closing the application
+//by clicking the windowtab
+//#define APP_SIGNATURE  "application/x-vnd.obos-stylededit"
+//application signature consistent with with the one in StyledEdit.rdef
+//seems to work, 021021
+#define APP_SIGNATURE  "application/x-vnd.obos.styled-edit"
 
 const float MENU_BAR_HEIGHT= 19.0;
 const float TEXT_INSET= 3.0;
diff --git a/src/apps/stylededit/FindWindow.cpp b/src/apps/stylededit/FindWindow.cpp
index 482a1a5604..9c9018d55b 100644
--- a/src/apps/stylededit/FindWindow.cpp
+++ b/src/apps/stylededit/FindWindow.cpp
@@ -38,7 +38,7 @@ FindWindow::FindWindow(BRect frame, BHandler *_handler, BString *searchString, b
 															
 	fFindView->AddChild(fSearchString= new BTextControl(BRect(14,12,277,30), "", "Find:", NULL, NULL,
 		B_FOLLOW_LEFT|B_FOLLOW_TOP,B_WILL_DRAW|B_NAVIGABLE));
-	fSearchString->SetDivider(27);
+		fSearchString->SetDivider(27);
 	fFindView->AddChild(fCaseSensBox= new BCheckBox(BRect(44,36,162,52),"","Case-sensitive", NULL,
 		B_FOLLOW_LEFT|B_FOLLOW_TOP,B_WILL_DRAW|B_NAVIGABLE));
 	fFindView->AddChild(fWrapBox= new BCheckBox(BRect(44,58,190,73),"","Wrap-around search", NULL,
@@ -56,7 +56,8 @@ FindWindow::FindWindow(BRect frame, BHandler *_handler, BString *searchString, b
 	
 	const char *text= searchString->String();
 	
-	fSearchString->SetText(text);
+    fSearchString->SetText(text);
+	fSearchString-> MakeFocus(true); //021021
 	
 	if(*caseState== true)
 		fCaseSensBox->SetValue(B_CONTROL_ON);
diff --git a/src/apps/stylededit/ReplaceWindow.cpp b/src/apps/stylededit/ReplaceWindow.cpp
index 6c61b0ed35..ef324e61bf 100644
--- a/src/apps/stylededit/ReplaceWindow.cpp
+++ b/src/apps/stylededit/ReplaceWindow.cpp
@@ -30,11 +30,13 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler *_handler, BString *searchStr
 				: BWindow(frame, "", B_MODAL_WINDOW, B_NOT_RESIZABLE,B_CURRENT_WORKSPACE) 
 			{
 	
-	fReplaceView=new BView(Bounds(),"",B_FOLLOW_ALL_SIDES,B_WILL_DRAW);
+	fReplaceView= new BView(Bounds(),"",B_FOLLOW_ALL_SIDES,B_WILL_DRAW);
 	fReplaceView->SetViewColor(216,216,216);
+	
 	fReplaceView->AddChild (fSearchString= new BTextControl(BRect(5,10,290,50), "", "Find:",NULL, NULL,
 		B_FOLLOW_LEFT|B_FOLLOW_TOP,B_WILL_DRAW|B_NAVIGABLE));
-	fSearchString->SetDivider(65);
+	fSearchString-> SetDivider(65);
+	
 	fReplaceView->AddChild(fReplaceString=new BTextControl(BRect(5,35,290,50), "", "Replace with:",NULL,
 		 NULL,B_FOLLOW_LEFT|B_FOLLOW_TOP,B_WILL_DRAW|B_NAVIGABLE));
 	fReplaceString->SetDivider(65);
@@ -59,13 +61,14 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler *_handler, BString *searchStr
 	fReplaceButton->MakeDefault(true);
 	
 	AddChild(fReplaceView);
-	fHandler=_handler;
+	fHandler= _handler;
 	
 	const char *searchtext= searchString->String();
 	const char *replacetext= replaceString->String(); 
 	
 	fSearchString->SetText(searchtext);
 	fReplaceString->SetText(replacetext);
+	fSearchString-> MakeFocus(true); //021021
 	
 	if(*caseState== true)
 		fCaseSensBox->SetValue(B_CONTROL_ON);
diff --git a/src/apps/stylededit/StyledEdit.rsrc b/src/apps/stylededit/StyledEdit.rsrc
index 88019db863..133fe21557 100644
Binary files a/src/apps/stylededit/StyledEdit.rsrc and b/src/apps/stylededit/StyledEdit.rsrc differ
diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp
index 4d8a17f585..d3a5ebea37 100644
--- a/src/apps/stylededit/StyledEditWindow.cpp
+++ b/src/apps/stylededit/StyledEditWindow.cpp
@@ -128,8 +128,9 @@ void StyledEditWindow::InitWindow(){
 	
 	viewFrame= Bounds();
 	
-	viewFrame.top = MENU_BAR_HEIGHT+1;
+	viewFrame.top = MENU_BAR_HEIGHT; //021021
 	viewFrame.right -=  B_V_SCROLL_BAR_WIDTH;
+	viewFrame.left = B_V_SCROLL_BAR_WIDTH-15; //021021
 	viewFrame.bottom -= B_H_SCROLL_BAR_HEIGHT; 
 	
 	
@@ -141,11 +142,11 @@ void StyledEditWindow::InitWindow(){
 	fTextView= new StyledEditView(viewFrame, textBounds, this);
 	fTextView-> SetDoesUndo(true);
 	fTextView-> SetStylable(true);
-	fTextView-> MakeFocus(true);
+	
 	
 	fScrollView= new BScrollView("scrollview", fTextView, B_FOLLOW_ALL, 0, true, true, B_NO_BORDER);
 	AddChild(fScrollView);
-	
+	fTextView-> MakeFocus(true);
 	
 		
 	//Add "File"-menu:
@@ -157,17 +158,17 @@ void StyledEditWindow::InitWindow(){
 	fMenuBar-> AddItem(menu);
 	
 	menu-> AddItem(menuItem= new BMenuItem("New", new BMessage(MENU_NEW), 'N'));
-	menu-> AddItem(menuItem= new BMenuItem("Open..", new BMessage(MENU_OPEN)));
+	menu-> AddItem(menuItem= new BMenuItem("Open...", new BMessage(MENU_OPEN), 'O'));
 	menuItem->SetTarget(be_app);
 	menu-> AddSeparatorItem(); 
 	
 	menu-> AddItem(fSaveItem= new BMenuItem("Save", new BMessage(MENU_SAVE), 'S')); 
 	fSaveItem-> SetEnabled(false); 
-	menu-> AddItem(menuItem= new BMenuItem("Save as", new BMessage(MENU_SAVEAS)));
+	menu-> AddItem(menuItem= new BMenuItem("Save as...", new BMessage(MENU_SAVEAS)));
 	menuItem-> SetEnabled(true);				
 	
-	menu-> AddItem(menuItem= new BMenuItem("Revert to Saved", new BMessage(MENU_REVERT))); 
-	menuItem-> SetEnabled(true); 									
+	menu-> AddItem(fRevertItem= new BMenuItem("Revert to Saved", new BMessage(MENU_REVERT))); 
+	fRevertItem-> SetEnabled(false); 									
 	menu-> AddItem(menuItem= new BMenuItem("Close", new BMessage(MENU_CLOSE), 'W'));
 	
 	menu-> AddSeparatorItem();
@@ -206,10 +207,10 @@ void StyledEditWindow::InitWindow(){
 	menuItem-> SetTarget(fTextView);
 	
 	menu-> AddSeparatorItem();
-	menu-> AddItem(menuItem= new BMenuItem("Find", new BMessage(MENU_FIND),'F'));
+	menu-> AddItem(menuItem= new BMenuItem("Find...", new BMessage(MENU_FIND),'F'));
 	menu-> AddItem(menuItem= new BMenuItem("Find Again",new BMessage(MENU_FIND_AGAIN),'G'));
 	menu-> AddItem(menuItem= new BMenuItem("Find Selection", new BMessage(MENU_FIND_SELECTION),'H'));
-	menu-> AddItem(menuItem= new BMenuItem("Replace", new BMessage(MENU_REPLACE),'R'));
+	menu-> AddItem(menuItem= new BMenuItem("Replace...", new BMessage(MENU_REPLACE),'R'));
 	menu-> AddItem(menuItem= new BMenuItem("Replace Same", new BMessage(MENU_REPLACE_SAME),'T'));
 	
 	//Add the "Font"-menu:
@@ -312,7 +313,7 @@ void StyledEditWindow::InitWindow(){
 	
 	fSavePanel= new BFilePanel(B_SAVE_PANEL, new BMessenger(this), NULL, B_FILE_NODE, false);
 	Register(true);
-	Minimize(true);	
+		
 	}  /***StyledEditWindow::Initwindow()***/
 	
 	void StyledEditWindow::MessageReceived(BMessage *message){
@@ -654,6 +655,7 @@ status_t StyledEditWindow::Save(BMessage *message){
 		
 		fSaveItem-> SetEnabled(false); 
 		fTextSaved= true;
+		fRevertItem-> SetEnabled(true);
 		return err;						
 } /***Save()***/
 
@@ -682,6 +684,7 @@ void StyledEditWindow::OpenFile(entry_ref *ref){
 				fSaveMessage->AddRef("directory",&parentRef);
 				fSaveMessage->AddString("name", name);
 				SetTitle(name);
+				fRevertItem-> SetEnabled(true);
 			}	
 		}
 	}				
diff --git a/src/apps/stylededit/StyledEditWindow.h b/src/apps/stylededit/StyledEditWindow.h
index 27e3b94e67..4726b87c18 100644
--- a/src/apps/stylededit/StyledEditWindow.h
+++ b/src/apps/stylededit/StyledEditWindow.h
@@ -69,6 +69,7 @@ class StyledEditWindow: public BWindow{
 		BMessage		*fPrintSettings;
 		BMessage		*fSaveMessage; 
 		BMenuItem		*fSaveItem;
+		BMenuItem		*fRevertItem;
 		BMenuItem		*fUndoItem;
 		BMenuItem		*fCutItem;
 		BMenuItem		*fCopyItem;