Optimise Service order UI