Updated Layout

Some small bugfixes as well.