Sample app improvements