Converting to Bootstrap - it's getting messy