A lot of changes

UI and Tweaking things.