Cameras layer added + some minor changes