Content rearrange and some design tweaks