UI Fixes & Stop Button