cleaned up form display