Improving GUI and adding person handling