Updating layout with the new bootstrap + making it a bit nicer