Fixes for two UI bugs