Few styling tweaks and layout changes