Change design (will need refactorization of templates later)