Fix container width and rebuild

Instead of setting a container max width we need to use the dynamic
botostrap valiables in order to actually control every possible
usecase