Various design improvements.

Cred to Adis @ Buildlog.eu!