Added Room, Player and tweeked NAFW