Success/Fail messages, Improved UI, Refactoring