add header controller and minor change