#11 Improved flow and use FontAwesome icons in many places