Here is the new design

A Little bit of Front End stuff as well as the modification to handle the errors.