Shai modified index page; Merged admin login