Further extension of GUI and features