added metric support, organized account pages under /account