Updated to be more compatible with bootstrap