Bugfix design fixes