Generic bug fixes and jquery + bootstrap upgrade