Better variable scoping, add search by StationID, re-order control container layout