Refactored buses view