Upadated views
added simple GPS functionality