Design Updates/Bugfixes

Continuation of #183