Layout and search views
Merge branch 'master' of github.com:jason-d/nama-biru