Merging CM and fixing overlay issues