Initial version of redesign to make app more CfA-ish :)