Partial commit for new player layout.