improved search
working tables and layout