Added options menu
More buldings
Merge