reformat menu and add css highlighting