UI tweaks
UI tweaks, some more logic for turn switching