fixed the UI, still needs work.  Fixed icons.