Started improving the layout of the project