demo app layout improvements