Reverting to a single column for departments list
Merge branch 'refs/heads/master' into test