Made changes to layer manager

Cleaned up the layer manager…