added a few speakers, small tweaks to layout