Added FontAwesome icons, and re-arranged layout components into re-usable elements.