Redesign with bootstrap library