Resolved an issue with shared group layering and some other minor issues