Change elements size depenending on their content.
Chamge elements size depending on their content.

Minor visual changes.
Refactoring.