front end fixes
fixes
more refactor