Fix to put the form on a different panel so it can be hidden when no res...

Splitting of the forms out so work on cleaning up the page can begin