Bunch of styling and templating improvements