Refactored layouts to split player in a partial.