UI fixes across templates
Merge pull request #1 from ppapadeas/dev

UI fixes across templates