Bootstrap additions and some tidy up, it's been a while