Misc Changes

Fixed Broken Code to make it a Working POC
Removed Unused code
Minor changes to GUI