Better Layout and Bugfixes