Added changing header and fixed margins