Add a white arrow next to the selected item in menu
Refactor the views a bit