Basic layout and functionality updates