Added some better style, separated templates, logo