regrouping css and adjusting forms