Several UI bugs fixes