Added more user messaging and added icon