Search form add, some layout additions