Gui updates.
Gui updates.
Tests
Readding gui controls.