Fix form and reorganize css