Minor improvements before major changes on GUI.