Restructure some of the page handlers and add show handler