Add media-query to bus-well
Further prepare for release, clean up