Updated markup to reflect the new composition. Added icons to from page.