Fix alignment and margins