UI polish & bugfixes