making layout tweaks
fixed index conlficts