Additional UI reworks