readjust frontend templates structure