fare cleanup and ui fixes