apply(*): refactor app layout  refactor to conform to best template