Queries Fixed
Code Clean up -- Getting rid of the extra form