Modified base layout