Content re-arrangement and design tweaks