pushed changes from toy: shortcuts, pretty links, pretty types, new top bar...