Added small css change before switching branches
Users and authentication added
Fixed merge conflict