Improved UI and made compatible with <J7