Moved some stuff around to improve flow and also changed some styles to be consistent with theme.