Reworked templates/classes/styling