Added more fields to GUI