Finished layers and fixed appuser bug