Clean up + bug correction + new UI stub