Layout update, removed #50 from fixed (not yet)