Minor Changes (Bugs, Changes, ...)

Removed unnecessary stuff and minor Bugfixes in Layout.