Made more changes to the layout