Towards a sane layout and a start of the search as well