Added more tweaks including container and header position