Improve some layouts, remove and rename some files
Fix conflict