GPS layout and functions fix