last of the UI bugs?