Change how we handle the header
Update app to handler new way of handling header
Update views to use updated header method