Fixing play/pause button to be more robust, other UI tweaks