reorganize layout + minor changes