2nd commit. App functional. Layout changes.