major bugfixes and some layout issues fixed