Changed view of homescreen, fixed bug in merchant maps, took out merchant list