UI part finished, hotfix on client; minor improvements