Some improvements in JS, markup, styles