Bug Fixes/ Updated Code/ Reloacted GUI's

Signed-off-by: C.J. Hollis <Chollis81@yahoo.com>