Mapping and Sizing Fixes, Search link added, Cleanup