some layout changes & bugfixes