[WIP] simplify samples app
[WIP] improve samples app