minor tweaks all around, nicer buttons