reformatted views and controller