UI fixes on 5.0 beta 5.