Updated menu and context menu view

had to rethink the top menu, figured this way active item stands out a bit more. Context menu with icons added (big thanks to http://iconmonstr.com/ for placeholder icons ) :)