Updated layers and applied some changes to UI