Users controller, bootstrap and other related tweaks