design bugfixes