Bug Fix & UI Fix & Sonor detect