Fixes to stops view