Fix base layout; walk with client side architecture