UI tweaks

UI tweaks, took out mylocation.java
Fixed a couple of things that were broken when merging the code
previously.