Update index.erb and overall layout fixes
Fixed merge issues
Fixed merge issues