Added options menu
Added a indication on current tab