styling and logic tweaks