various changes to layout to better suit embedding