Fixed UI issues
Fixed issue #24