Removed echo returns from console, put them into UI