adding more user friendly error message and cleaned up layout