Changed button layout (and removed some buttons); more updates in Maps and some bug fixes.