Broke up template in nicer components