chnaged user model again and design changes