layout fixes and search support; also changed join behavior