Further worked on bootstrap templates