Cleaned up form UI, more error handling