Updated Layout a Bit