improving responsiveness and add some tweaks in the interface