More updates to GUI and Model