Minor refactor, rewrote GUI handlers. Fixed some GUI issues.