Fix base layout