Improve layout of the project