more btn & js fixes