Revamp messages page to be more flexible for later additions