Restyling of several components, small bugfixes