Modified template system
Added some styling