Some UI cleanup for availability screen