Fix another graph bug + some more work on control page