improve layout and fix number of speakers