Cleaned up code and added proper FBR syntax to html