Couple of js frontend tweaks, cleanup