more work done around ui; added some proper namespacing (unfinished)