UI refactor and added beep sound