Cleaned up UI, showing most of the fields