Layout changes and Bugfixes.