Bug Fixes

UI tweaks, bug fixes and extended into text.