Made Setup layout show normal toolbar is 'Setup' is done #832, improved wording on links & nav