Fixed minor issues with UI