Changed to work more nicely with bootstrap