ui tweaks
ui tweaks
merge weatherroulette-marc