#19887 Revamp UI of Job & Job Edit views