cleanup, ui polish, switching to dynamic mode
dynamically generating what we can

also removing obsolete code