Fix margins and finish initial layout styling