[UPDATE] moving header and some padding/margin fixes