switched to BS3, updated Users code, removed some unnecessary files