minor ui fixes
changed order of js scripts to avoid button method name clash