[IMPLEMENTED] Design modernization

[Sebastian]

@martijndijkgraaf96 Your feedback would be very welcome.

[mdijkgraaf]

I missed this message, I will try to take a look this weekend.