Redesign using bootstrap