more bootstrap tidy up