fix player & layout