Revert "Revert "Remove AppBar""

This reverts commit adbc52e14732370e0fad54ed19290082271aebbf.