Reorganized actionbar and menu classes
Reorganized menu class