flushed out UI, updated icons