More layout and user scaffold