Station Select: Minor improvements