Added logout, consolidated chart pages/controllers, ui cleanup