added performance test, minor fixed to views and controllers