fix css code
start user and home controller set up
fix merge issues