Style cleanup, align items properly