Fixed layouts and added search