Added some config and updated index page a bit
 fixed conflicts of merge