+ @judorneles: few layout tweaks
moving main template stuff to main template