Fixed layout issues, added some templates