More cleanup and fixes
Moving show* methods to View