Updating with Bootstrap components and styles

Work in progress