Reorganize base layout components