rejiggered layout completely