Further small design changes.
Use rectangular design.
Fix layout.