BISERVER-8428 - Updated some UI related items