Second Layout & fixed audio