Layout and finder

Layout and finder