first draft UI rewrite complete