merge complete:TODO, enhance deisgn of 2d view on top of the camera layer