Using some bootstrap stuff for now, icons, word changes