Recovering after bad merge, moving to bootstrap with simpler styles and
integrated acocunts ui