Outline general layout components during development and do some improvements