fixed all container layout redunancies