Added some benchmarking vars
Updated the index to match the new layout of the MVC
Modified the layout for the configuration files
Modified the layout for the configuration files
(cherry picked from commit c219ca2)