VID-560 fixing up the front end after back end has been hooked up