Fixed header issue
Updated to use controllers
merge