Fixed header padding, resolved merge issues