Added base for Building Menu
Fixed merge conflicts