more searching, and fixed the layouts i think