Added templating and some style