V1.7- Resolved Github Issues

Resolved #22, #87
I think we should wait until webmap and layer is loaded and use fields from that to prevent from calling the layer service twice. Can you take that approach?