cleaning up javascript, add BS3 & FA2.3