Re-arranged content per suggestions.