moved to views
cleaned templates