Re-arranged some styles