Bug fix/improve user experience