Restructure views, fix left menu - working copy