Refactored station cell highlighting
Started on swiping