Made Colin's User Experience changes