Design changes and included boostrap to layout