Clean up

Moved NavBar related code in correct file. Moved all GA related code in
separate file.