Small UI changes
Fix issues