Added more fixes to the work pages