changed layout a bit, Putting in support for locking some features.