improved implementation of bootstrap and jquery