Several Layout- & Bugfixes