Improved paddings / spacing of elements. Rel. GCP-8898

Reviewer: Dan Jao (pending)