BS3 updates

Cleanup and improved User views (Cerber Theme)