Added header controller and fixed various color issues