refactored for bootstrap3 and tidy up