consolidating ui, adding bugfixes