Update base layout and design