Remove residual div and do some spacing adjustments