Fixed lingering ui issues