bugfixes & design update