Some final adjustments to the internal layout