Add accounts-entry and tweak the config and design a bit. Refs #3