Added base layout