Update Tool Show to adhere to model and fix Visual Glitch