Minor UI and functionalities fixes.