Fixed draw condition error, added better UI. Bugfixes