added fieldsets and labels, did some positioning