Gui updates and drawing bug fixed
Merge HUGE changes