Few fixes, layer issues etc
Few fixes, layer issues etc