Fixed templates overflowing