made templates simpler
added more components