Polish layout and header