Minor fixes
Moving to index.php