Improve layout, resolve conflicts, fix bugs and labels and delete files useless