Mostly Mainform updates

Converted the Mainform dialogs to GridBagLayouts to enable scalability as well as removing the preset strings I was going for local GTFS import.  Also added bus stop icon fix from upload-only-selected branch,