Continued revamp of add ticket screen, refs EMP-220