Fixing some layout & index issue