- Added comments functionallity and improved the template style