[IMP] Improved Templates, removed extra images/spaces and misc changes