restructure base layout