Feature/user dashboard 295