GUI improvements, TODOs