front tweaks and js structure