Improved demo app layout