align e clean the layout, organize some information, remove some cases and implement others