Add widget code, move menu to application layout