Updated the display and added little UI validation