Optimized button action and made some UI updates