Slight coloring and button tweaks