fixed several UI pieces