Issue190

Changes to many of the UI issues!