Partially closes. #713 (closed)
Fix some styling for new template
This will create a new commit in order to revert the existing changes.
