[CLEANUP] Improve the layout and fix some wording/markup issues