Changes to the UI, fixed a major bug