Revised Terrain and menu system