applied design template for layout
replaced bootstrap file
resolved conflict
applied new template changes to the app