started modal work, fixed template