diff --git a/src/gui/save/LocalSaveActivity.cpp b/src/gui/save/LocalSaveActivity.cpp
index dfcc39e22..65e9dfb78 100644
--- a/src/gui/save/LocalSaveActivity.cpp
+++ b/src/gui/save/LocalSaveActivity.cpp
@@ -122,7 +122,7 @@ void LocalSaveActivity::saveWrite(std::string finalFilename)
 void LocalSaveActivity::OnDraw()
 {
 	Graphics * g = ui::Engine::Ref().g;
-	g->draw_rgba_image((unsigned char*)save_to_disk_image, -10, 0, 0.7f);
+	g->draw_rgba_image((unsigned char*)save_to_disk_image, 0, 0, 0.7f);
 	g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
 	g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
 
diff --git a/src/gui/tags/TagsView.cpp b/src/gui/tags/TagsView.cpp
index 03b289366..1cef7be8f 100644
--- a/src/gui/tags/TagsView.cpp
+++ b/src/gui/tags/TagsView.cpp
@@ -30,6 +30,7 @@ TagsView::TagsView():
 	closeButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	closeButton->SetActionCallback(new CloseAction(this));
 	AddComponent(closeButton);
+	SetCancelButton(closeButton);
 
 
 	tagInput = new ui::Textbox(ui::Point(8, Size.Y-40), ui::Point(Size.X-60, 16), "", "[new tag]");
@@ -55,7 +56,7 @@ TagsView::TagsView():
 	addButton->SetActionCallback(new AddTagAction(this));
 	AddComponent(addButton);
 
-	title = new ui::Label(ui::Point(5, 5), ui::Point(185, 16), "Manage tags:");
+	title = new ui::Label(ui::Point(5, 5), ui::Point(185, 16), "Manage tags:    \bgTags are only to \nbe used to improve search results");
 	title->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
 	title->Appearance.VerticalAlign = ui::Appearance::AlignTop;
 	AddComponent(title);
diff --git a/src/gui/tags/TagsView.h b/src/gui/tags/TagsView.h
index a842e1373..06a4df807 100644
--- a/src/gui/tags/TagsView.h
+++ b/src/gui/tags/TagsView.h
@@ -24,7 +24,7 @@ class TagsView: public ui::Window {
 public:
 	TagsView();
 	virtual void OnDraw();
-	void AttachController(TagsController * c_) { c = c_; };
+	void AttachController(TagsController * c_) { c = c_; }
 	virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt);
 	void NotifyTagsChanged(TagsModel * sender);
 	virtual ~TagsView();