redesign and manual view bugfix