Improve the bus selector visual look
Refactor bus-selector into its own file