Improvements
More improvements
Fixed potencial UI bugs