Updates based on notes in BAsecamp for badges and layout elements