Merged with personal template

Used some of the HTML code, and some of the js functionalities to
extend my personal template