Made a lot of changes to both UIs and added Map functionality