Lint fixes
UI changes + haptic feedback