- fixing UI bugs