Merging form css and cleanup