cleanup + use container-fluid for full width use