Separated base layouts and added bootstrap