More editing

added more combo boxes and changed layout a little. Still needs work.
Also, added tool bar at the top File, Edit.