Fixing small tempalte issues