Status pages minus the E1 only guy
Merge clean up