Major reorganization of layout and search form