Change container-fluid to container for Bootstrap 3
Remove some odd width adjustments and restore a float for Bootstrap 3