Fix layout to follow bc CSS