Change usage of ModalView
Fix design of SideNaviView