gui code simplification and beautification; some new TODOs.