Reorganize elements, Fix the css