Added navigation and tidy gauge code