Bugfixes and design update