Ivan UI Updates
more fixes
Merge pull request #31 from Wyshme/ivan-fixes

Ivan UI Updates