Style updates and layout tweaks