Move code out of static#main into layout
Merge pull request #6 from RingBase/AB-organization-dashboard

Move code out of static#main into layout