Minor updates to GUI

Updated code structure
Updated panels
Added validation