Better error handling
Adding icons and better column handling