Restructure/refactor, add aside, change fonts and colors.