experimenting with main menu
fixed drop-down menu issue
fixed git conflict