Fixes for re-arrangement of control elements on fee sheet and left nav when layouts are different