Fix some views, menu, aesthetic changes