Changed template structure. Updated styles helpers.