diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index a2ae2e7eb..dbd7888c4 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -824,37 +824,6 @@ SaveFile * Client::GetStamp(std::string stampID)
 	{
 		return NULL;
 	}
-	/*std::ifstream stampFile;
-	stampFile.open(std::string(STAMPS_DIR PATH_SEP + stampID + ".stm").c_str(), std::ios::binary);
-	if(stampFile.is_open())
-	{
-		stampFile.seekg(0, std::ios::end);
-		size_t fileSize = stampFile.tellg();
-		stampFile.seekg(0);
-
-		unsigned char * tempData = new unsigned char[fileSize];
-		stampFile.read((char *)tempData, fileSize);
-		stampFile.close();
-
-		SaveFile * file = new SaveFile(std::string(stampID).c_str());
-		GameSave * tempSave = NULL;
-		try
-		{
-			GameSave * tempSave = new GameSave((char *)tempData, fileSize);
-			file->SetGameSave(tempSave);
-		}
-		catch (ParseException & e)
-		{
-			delete[] tempData;
-			std::cerr << "Client: Invalid stamp file, " << stampID << " " << std::string(e.what()) << std::endl;
-		}
-		delete[] tempData;
-		return file;
-	}
-	else
-	{
-		return NULL;
-	}*/
 }
 
 void Client::DeleteStamp(std::string stampID)
diff --git a/src/localbrowser/LocalBrowserModel.cpp b/src/localbrowser/LocalBrowserModel.cpp
index 60e20c3b9..a38ca1fce 100644
--- a/src/localbrowser/LocalBrowserModel.cpp
+++ b/src/localbrowser/LocalBrowserModel.cpp
@@ -87,6 +87,11 @@ void LocalBrowserModel::UpdateSavesList(int pageNumber)
 	notifySavesListChanged();
 }
 
+int LocalBrowserModel::GetPageCount()
+{
+	return std::max(1, (int)(std::ceil(float(Client::Ref().GetStampsCount())/20.0f)));
+}
+
 void LocalBrowserModel::SelectSave(std::string stampID)
 {
 	for(int i = 0; i < selected.size(); i++)
diff --git a/src/localbrowser/LocalBrowserModel.h b/src/localbrowser/LocalBrowserModel.h
index a0a295609..e6b6905b5 100644
--- a/src/localbrowser/LocalBrowserModel.h
+++ b/src/localbrowser/LocalBrowserModel.h
@@ -27,7 +27,7 @@ class LocalBrowserModel {
 	void notifySelectedChanged();
 public:
 	LocalBrowserModel();
-	int GetPageCount() { return std::max(1, (int)(std::ceil(stampIDs.size()/16))); }
+	int GetPageCount();
 	int GetPageNum() { return currentPage; }
 	void AddObserver(LocalBrowserView * observer);
 	std::vector<SaveFile *> GetSavesList();
diff --git a/src/localbrowser/LocalBrowserView.cpp b/src/localbrowser/LocalBrowserView.cpp
index 448b5c510..234b14b5a 100644
--- a/src/localbrowser/LocalBrowserView.cpp
+++ b/src/localbrowser/LocalBrowserView.cpp
@@ -41,7 +41,8 @@ LocalBrowserView::LocalBrowserView():
 		}
 	};
 	nextButton->SetActionCallback(new NextPageAction(this));
-	nextButton->Appearance.HorizontalAlign = ui::Appearance::AlignRight;	nextButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	nextButton->Appearance.HorizontalAlign = ui::Appearance::AlignRight;
+	nextButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 
 	class PrevPageAction : public ui::ButtonAction
 	{
@@ -54,7 +55,8 @@ LocalBrowserView::LocalBrowserView():
 		}
 	};
 	previousButton->SetActionCallback(new PrevPageAction(this));
-	previousButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	previousButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	previousButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	previousButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 
 	class RemoveSelectedAction : public ui::ButtonAction
 	{
@@ -186,7 +188,7 @@ void LocalBrowserView::OnMouseWheel(int x, int y, int d)
 {
 	if(!d)
 		return;
-	if(d<0)
+	if(d>0)
 		c->NextPage();
 	else
 		c->PrevPage();