bugfixes and styling fixing