First commit, update show view clean up messy stuff