More styling tweaks and begin work needed to move to Font Awesome for icons