more changes regarding the view and how it behaves