Added  in View class, fixed other UI issues