UI tweaks... happier now