New error checking and formatting
Getting ready for mobile site