Feature/new design

This PR is not ready to merge yet. Oraclocat will choose you when it is ready :)