Basic layout update

Basic layout update.