changed some styles and reorganize form