Fixed layout issues in current player