Consolidate menu
Merge branch 'ribbon'
Interface overhaul and finalized style (css)