Added user feedback and fixed spacing