Added better styling and messages to user - CP