fix paddings and finalise layout tidyup