updates
Merge conflicts resolved.
fixed appbar property from position to placement.