switched Layer and View, closing issue #12