Changed menu system and added bootstrap